From: Jochen Sprickerhof Date: Tue, 11 Nov 2014 13:52:22 +0000 (+0100) Subject: Change openni-dev to libopenni, Closes: #768953 X-Git-Tag: archive/raspbian/1.14.0+dfsg-2+rpi1^2~231 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=fe2a03f23ae198ce0acc598b820169c602854722;p=pcl.git Change openni-dev to libopenni, Closes: #768953 Add 0001-Package-names-for-OpenNI-and-OpenNI2-were-wrong-in-c.patch and 0002-Corrected-openni-dev-and-openni2-dev-in-PCLConfig.cm.patch taken from upstream. --- diff --git a/debian/patches/0001-Package-names-for-OpenNI-and-OpenNI2-were-wrong-in-c.patch b/debian/patches/0001-Package-names-for-OpenNI-and-OpenNI2-were-wrong-in-c.patch new file mode 100644 index 00000000..81ef41c7 --- /dev/null +++ b/debian/patches/0001-Package-names-for-OpenNI-and-OpenNI2-were-wrong-in-c.patch @@ -0,0 +1,82 @@ +From 881e4cf919a86ebc58ab80b51ac5d154f3b8f82e Mon Sep 17 00:00:00 2001 +From: Emmanuel Durand +Date: Thu, 25 Sep 2014 16:11:47 -0400 +Subject: [PATCH 1/3] Package names for OpenNI and OpenNI2 were wrong in cmake + modules and in output pkgconfig file + +--- + cmake/Modules/FindOpenNI.cmake | 4 ++-- + cmake/Modules/FindOpenNI2.cmake | 4 ++-- + io/CMakeLists.txt | 4 ++-- + visualization/CMakeLists.txt | 4 ++-- + 4 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/cmake/Modules/FindOpenNI.cmake b/cmake/Modules/FindOpenNI.cmake +index cb537be..9f772a4 100644 +--- a/cmake/Modules/FindOpenNI.cmake ++++ b/cmake/Modules/FindOpenNI.cmake +@@ -35,9 +35,9 @@ if(NOT WIN32) + endif(NOT WIN32) + + if(${CMAKE_VERSION} VERSION_LESS 2.8.2) +- pkg_check_modules(PC_OPENNI openni-dev) ++ pkg_check_modules(PC_OPENNI libopenni) + else() +- pkg_check_modules(PC_OPENNI QUIET openni-dev) ++ pkg_check_modules(PC_OPENNI QUIET libopenni) + endif() + + set(OPENNI_DEFINITIONS ${PC_OPENNI_CFLAGS_OTHER}) +diff --git a/cmake/Modules/FindOpenNI2.cmake b/cmake/Modules/FindOpenNI2.cmake +index 036e4e0..713099a 100644 +--- a/cmake/Modules/FindOpenNI2.cmake ++++ b/cmake/Modules/FindOpenNI2.cmake +@@ -35,9 +35,9 @@ if(NOT WIN32) + endif(NOT WIN32) + + if(${CMAKE_VERSION} VERSION_LESS 2.8.2) +- pkg_check_modules(PC_OPENNI2 openni2-dev) ++ pkg_check_modules(PC_OPENNI2 libopenni2) + else() +- pkg_check_modules(PC_OPENNI2 QUIET openni2-dev) ++ pkg_check_modules(PC_OPENNI2 QUIET libopenni2) + endif() + + set(OPENNI2_DEFINITIONS ${PC_OPENNI_CFLAGS_OTHER}) +diff --git a/io/CMakeLists.txt b/io/CMakeLists.txt +index 347f658..6106349 100644 +--- a/io/CMakeLists.txt ++++ b/io/CMakeLists.txt +@@ -329,10 +329,10 @@ if(build) + set(EXT_DEPS eigen3) + + if(OPENNI_FOUND) +- list(APPEND EXT_DEPS openni-dev) ++ list(APPEND EXT_DEPS libopenni) + endif(OPENNI_FOUND) + if(OPENNI2_FOUND) +- list(APPEND EXT_DEPS openni2-dev) ++ list(APPEND EXT_DEPS libopenni2) + endif(OPENNI2_FOUND) + + PCL_MAKE_PKGCONFIG("${LIB_NAME}" "${SUBSYS_NAME}" "${SUBSYS_DESC}" +diff --git a/visualization/CMakeLists.txt b/visualization/CMakeLists.txt +index d7becc5..746a693 100644 +--- a/visualization/CMakeLists.txt ++++ b/visualization/CMakeLists.txt +@@ -154,10 +154,10 @@ if(build) + + set(EXT_DEPS "") + if(OPENNI_FOUND) +- list(APPEND EXT_DEPS openni-dev) ++ list(APPEND EXT_DEPS libopenni) + endif(OPENNI_FOUND) + if(OPENNI2_FOUND) +- list(APPEND EXT_DEPS openni2-dev) ++ list(APPEND EXT_DEPS libopenni2) + endif(OPENNI2_FOUND) + PCL_MAKE_PKGCONFIG("${LIB_NAME}" "${SUBSYS_NAME}" "${SUBSYS_DESC}" + "${SUBSYS_DEPS}" "${EXT_DEPS}" "" "" "") +-- +2.1.3 + diff --git a/debian/patches/0002-Corrected-openni-dev-and-openni2-dev-in-PCLConfig.cm.patch b/debian/patches/0002-Corrected-openni-dev-and-openni2-dev-in-PCLConfig.cm.patch new file mode 100644 index 00000000..53a40c82 --- /dev/null +++ b/debian/patches/0002-Corrected-openni-dev-and-openni2-dev-in-PCLConfig.cm.patch @@ -0,0 +1,53 @@ +From 2f94cf21bead8bbb84211d3a182fd30d390df157 Mon Sep 17 00:00:00 2001 +From: Emmanuel Durand +Date: Fri, 26 Sep 2014 08:59:46 -0400 +Subject: [PATCH 2/3] Corrected openni-dev and openni2-dev in + PCLConfig.cmake.in + +--- + PCLConfig.cmake.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in +index 65ea688..5f5b07f 100644 +--- a/PCLConfig.cmake.in ++++ b/PCLConfig.cmake.in +@@ -174,7 +174,7 @@ macro(find_qhull) + endif(QHULL_FOUND) + endmacro(find_qhull) + +-#remove this as soon as openni-dev is shipped with FindOpenni.cmake ++#remove this as soon as libopenni is shipped with FindOpenni.cmake + macro(find_openni) + if(NOT OPENNI_ROOT AND ("@HAVE_OPENNI@" STREQUAL "ON")) + set(OPENNI_INCLUDE_DIRS_HINT "@OPENNI_INCLUDE_DIRS@") +@@ -182,7 +182,7 @@ macro(find_openni) + endif(NOT OPENNI_ROOT AND ("@HAVE_OPENNI@" STREQUAL "ON")) + + if(PKG_CONFIG_FOUND) +- pkg_check_modules(PC_OPENNI openni-dev) ++ pkg_check_modules(PC_OPENNI libopenni) + endif(PKG_CONFIG_FOUND) + find_path(OPENNI_INCLUDE_DIRS XnStatus.h + HINTS ${PC_OPENNI_INCLUDEDIR} ${PC_OPENNI_INCLUDE_DIRS} +@@ -210,7 +210,7 @@ macro(find_openni) + endif(OPENNI_FOUND) + endmacro(find_openni) + +-#remove this as soon as openni2-dev is shipped with FindOpenni2.cmake ++#remove this as soon as libopenni2 is shipped with FindOpenni2.cmake + macro(find_openni2) + if(NOT OPENNI2_ROOT AND ("ON" STREQUAL "ON")) + get_filename_component(OPENNI2_LIBRARY_HINT "OPENNI_LIBRARY-NOTFOUND" PATH) +@@ -222,7 +222,7 @@ macro(find_openni2) + endif(WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 8) + + if(PKG_CONFIG_FOUND) +- pkg_check_modules(PC_OPENNI2 openni2-dev) ++ pkg_check_modules(PC_OPENNI2 libopenni2) + endif(PKG_CONFIG_FOUND) + + find_path(OPENNI2_INCLUDE_DIRS OpenNI.h +-- +2.1.3 + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..8bc793ed --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +0001-Package-names-for-OpenNI-and-OpenNI2-were-wrong-in-c.patch +0002-Corrected-openni-dev-and-openni2-dev-in-PCLConfig.cm.patch